feat(aws): Add support for automatic wrapping in ESM #17407
Merged
+714
−132
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
msonnb
commented
Aug 13, 2025
Comment on lines
+30
to
+34
| responseHook(_span, { err }) { | ||
| if (err) { | ||
| captureException(err, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.otel')); | ||
| } | ||
| }, |
There was a problem hiding this comment.
capturing errors here ensures that they're connected to the span correctly
msonnb
commented
Aug 13, 2025
packages/aws-serverless/src/init.ts
Outdated
There was a problem hiding this comment.
moved init code to separate file to avoid circular dependency
msonnb
changed the title
size-limit report 📦
|
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
andreiborza
reviewed
Aug 25, 2025
Comment on lines
61
to
62
| const PACKAGE_VERSION = '0.54.0'; | ||
| const PACKAGE_NAME = '@opentelemetry/instrumentation-aws-lambda'; |
There was a problem hiding this comment.
l/m: Since this is now our own instrumentation, let's use @sentry/instrumenation-aws-lambda and for version we can import und use SDK_VERSION from @sentry/core, but let's leave a comment that at the time of vendoring we used 0.54.0.
There was a problem hiding this comment.
Not strictly necessary but probably makes it easier to understand/debug.
packages/aws-serverless/src/integration/instrumentation-aws-lambda/instrumentation.ts
Show resolved
Hide resolved
andreiborza
reviewed
Aug 25, 2025
| @@ -108,58 +59,6 @@ function getRejectedReasons<T>(results: PromiseSettledResult<T>[]): T[] { | |||
| }, []); | |||
| } | |||
|
|
|||
| /** */ | |||
| export function tryPatchHandler(taskRoot: string, handlerPath: string): void { | |||
There was a problem hiding this comment.
Mhm this is technically a breaking change 🤔
There was a problem hiding this comment.
Let's keep it around but no-op + deprecation warning.
msonnb
force-pushed
the
ms/aws-esm-auto-wrapping
branch
from
ba931a7 to
3ee810f
Compare
andreiborza
approved these changes
Aug 25, 2025
msonnb
force-pushed
the
ms/aws-esm-auto-wrapping
branch
from
3ee810f to
dee487a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows code-less setup for Lambda functions running in ESM (and thus the aws-serverless SDK in general) by vendoring the OpenTelemetry AwsLambda instrumentation and wrapping the patched handler with Sentry's
wrapHandler.